DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I7701b38bf0705fe2f72ec07e8aaf4878397ac840