DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ief4b64d793b60ab00f57b31f3a80ae388227f7a2