Android mainline 10.0.0 release 2
Snap for 5333170 from 03087a617bfe55f862cb1ef43273a2bd08e8b6d6 to qt-release

Change-Id: I76c1810c0900819a215f2dcfc35c3d0fdd0db8c8