DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Icd8b079a9c119fdd02ba79ae0feb19ebedd7f8db