DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I0cd065f74825393fe60f3864676099d79f3ba687