DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9dc8417f0d87c87eac13437834e69a52c1887258