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

Change-Id: Ib7aeaa998fdc1520525a6c2b52b761deff0a1b05