DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I62fbdaa466973145ddd98a0b88fdb500fad84a02