DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Iacdd95e11ac8a075e6f6e30b847d7a8b153102e8