DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Idc05da05ba506ef82c18bde571bc95171f0a7e2b