Merge tag 'android-10.0.0_r9' of https://android.googlesource.com/platform//frameworks/native into HEAD

Android 10.0.0 Release 9 (QD1A.190821.011.C4)

Change-Id: Id0a6fb1ec4d35ae12e76718de8f4941f8458fdcf