Android mainline 10.0.0 release 3
Snap for 5713174 from 53bd18d5e06c43c0ab39a0e5251e38a926549235 to qt-aml-release

Change-Id: I0c524848428edf2f4334c57d3d880d81f6612956