DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I5f8e472f3064295ae2945bbaaebac180fa9df0c4