Android 10.0.0 release 21
Merge cherrypicks of [9540209] into qt-qpr1-release

Change-Id: I2240af5849be0d074fe8c404de9c2ed15be2d557