Android mainline 10.0.0 release 3
Snap for 5698743 from c159b567c0d3ae4f8e08f5af3863047e855fcad4 to qt-aml-release

Change-Id: Id0eae2e1764100630a3bb5f3efc6c36145eb73eb