DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Iab543f9b658713d73056812b206122d21b1db68e