DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I3fd7354126a25fa38a84787543bf85032f7c5201