DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I8106a8daecbdf2ec83430c417d4dd7e2307439f8