DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I157adcfcb80167f923a414bc4890cdf8b59e1a1a