DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: If66f00aac018515b8d5774e07ca4cc7911b288fc