DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3642789b90cb5e10145e07f8fc44d7cd688bfad2