DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ic9046fa1839a2aed313702f73f1c809d7879490b