Android 10.0.0 release 21
Merge cherrypicks of [9802047, 9802131, 9802048, 9802634] into qt-qpr1-release

Change-Id: I2619620f18b53594be5ddd553dab7447915f9bc5