Merge branch 'master' into android10-gsi

bug: 146066070
Change-Id: I27d905d0c5ba84c36867bd3c054285fee860eac7