DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9901bd8685f2ad213d7d0efa88c51c9bba80a539