DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9e7e8d1457be3542cc00b9f9ce5a8a1500fb36c1