DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ia94cb35a5062d0d7f4d2439d43a64fceb6be5c89