DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I705adb517bc5cdd70c4f45fa627a274e4503dd2c