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

Change-Id: Ie57f9a1696584382d8649310989bd568f5e25899