DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I5f120ee1df2417c332667e6fd5d87d83e1ca0d0e