DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: Ie3917dc3edc8f81eba6a40522afe24635d9cd74d