Android mainline 10.0.0 release 3
Snap for 5617038 from 239fa21b5fd71c5672c067e4aa513888184e3be7 to qt-aml-release

Change-Id: I12c42db30b705b6db2c953cfd40722dcdcd8e9ab