DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibfac366eff7b1e63b2b6757d2600ef20f19e71a6