DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id4609cad94db5358ac03231a0537468b81f3dd33