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

Change-Id: Ia739016f8a6519a9e8a0dbd17dfd7202b06b3bf9