DO NOT MERGE - Merge Android 10 into master Bug: 139893257 Change-Id: I38429ee13989d447b1350d9f098d22786c2e9447