DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id112025ccf9343c809149f5b93c886af5508f5d9