DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I780dd912d767f88ba604c5b1028dace8bd37b567