DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3d73bf43d8985be0683859900ce9ffec0eb7a27f