Android 10.0.0 release 21
Merge master@5428150 into git_qt-dev-plus-aosp.
am: aec4af8179

Change-Id: Ia2f4b89de46cb1e3fb2eeef65ddae6868aa55dc5