DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ibf78b85b37e2624f56cbe730520e0202ffad2c38