DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Id844b347e95335800502d9b5aeb15e18aabd29e1