DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ib2980eb2298cc867635c9ed24350245235f06b9e