DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3671f9aedcd13d4e7874384ce1473627e6fe6d77