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

Change-Id: I7e8f4a6a75f26ab92aac87738fd1b33c90718d44