DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I7c1b81ded862765968ef14d10ae76359e2972f27