DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Iee54a2d226deff786a190480b6ca1d6f7424992c