DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I77f2eb0feebc7f2c49bf693e96a6b63265ea4beb