Android 10.0.0 release 11
Merge cherrypicks of [9452330, 9452331] into qt-release

Change-Id: I74782acd5d43b1586dab2a8b7c8ee62876a347f4