DO NOT MERGE - Merge Android 10 into master

Bug: 139893257
Change-Id: I546c6b154289a305c58a3113bde79c777c811320