DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id46d6370b1569ed342f5e31e36c98fa78f256c9a