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

Change-Id: Ibad0bf0ffdf576321a3762e067dd877e5f4d603f