DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibe521bb3a2a8dfe35c251d33b6b4b0b4a547804e