DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c