DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I25b8d7281e3e6449286370f04ed3467f90bf9135