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

Change-Id: Iea893c3e562f9101a3d2fbb9595d2633509ce93f