Android mainline 10.0.0 release 2
Snap for 5533315 from 8f2229abfc45f9c29769fcf172c33c6c54890658 to qt-aml-release

Change-Id: Ie1d8e542d04cc87c2de502d712dd14c7e708744c