DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9528ab710ab2545e3a14e1585d305a9c69130820