DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id15a0e7908a1feee86bab8cedd06024518107dd5