DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3ee2eb0c9eebb865231b7cacdd6d12a34e3586e0