DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I45345e4251fa8abf435a04ba318db72a5598380f