Android 10.0.0 Release 42 (QD4A.200317.024.A1)
Merge master@5428150 into git_qt-dev-plus-aosp.
am: 5f877e909a

Change-Id: If106a275eba623e8b8f4b8fe436d4c7d40b76a4e