DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I25f008250afbb638f1d450f105edc330b30030f3