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

Change-Id: I8896944b5d247998452e0461057174c46d1d0970