DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ic5ebae3be90a7b5b7f02e7512c2b18ff5d3e71b5