DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I051470350ba70a77ec5d78ab5cc9ff02bf4aa4b2