DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I8a200386bb14368e18a2a28c74e9c88cc91e0286