DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I337a9c213062582ded264ab24eb7e8e306e16206