Android mainline 10.0.0 release 2
Snap for 5803298 from 2f9cf082f9a8202986e1f87b4bc298fdbfc447e4 to qt-aml-release

Change-Id: I06c1df2ac04a87310e5d8450bb8bee1573b17bb0