DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I069a59c53185fba52335c893a8cc89d1d3fa943e