DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I6cf6c323b06b1b2f50112d30b162d1530ef816cf