DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9d37ecefcc91ebab3bc798d0deed9e924ca828d3