DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I261c69b9f179a03c1058dfa7f6d37f78203f8d99