DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I73abd798446b0a6a87bd6bf1107612395ad8cda4