DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I63f18bc50793010bd872d7e4b5df7ff66a56c07a