DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I406048833eef518faecfc1f0164d14aa94387d97