Android mainline 10.0.0 release 2
Snap for 5631779 from 6db49f3391216e06fd241f1598dee1c056f1d232 to qt-aml-release

Change-Id: Ia69fa1be9b25b2ff283d43430a7ce2fb59f741b4