Android mainline 10.0.0 release 3
Snap for 5582669 from 566b6fd0a4116df5e70b3bf833be88aa39542bdb to qt-aml-release

Change-Id: Id1d5f4c07c320bfb68abe68ff339b460f660aa3a