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

Change-Id: Ideac1d6c77d647d32b44645023700d29db29542f