Android mainline 10.0.0 release 2
Snap for 5803298 from e3f3c2abf65a36a4b0834bc137fb386bf058013e to qt-aml-release

Change-Id: If2d36fc64cc9e83a7dfb9b006d449167abb3984d