DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I05a3ad5e9fdf1e95a0c34a1226d12bccd9f1269f