DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I70264d2ce9d20694b86aaff57b0176f18b43c634