DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3d98bd70a659cad37d520fb0e7ecd631f622e8fb