Android mainline 10.0.0 release 3
Snap for 5704982 from b431a8c328798fc9c6010e989fddb4b54fec2194 to qt-aml-release

Change-Id: Iae990b64ee8aa17f18b5ae4c346658851499a535