Android 10.0.0 Release 9 (QD1A.190821.011.C4)
Merge master@5406228 into git_qt-dev-plus-aosp.
am: f894087d13

Change-Id: I3af58a10a7bf799825ea643f5ac2f2a4ab74ec55