Android mainline 10.0.0 release 3
Snap for 5688406 from 9f53eda37fe905211ce6546d32784e7f4d980614 to qt-aml-release

Change-Id: Ic51551c2aeaa3447aedc27179ec7d3710ffb3b59