DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ib82af17b8aaceab8357f6ba4280e9ec4d8eb4772