DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I9be32d660ea88584abd595e9e11d18d00b0b6a1d