Android mainline 10.0.0 release 3
Snap for 5606289 from 13e091470681b13eea293ebb6cf7208c07602ec1 to qt-aml-release

Change-Id: I4db42d6153e6dd4af3250acd974998b9365b5312