Android mainline 10.0.0 release 2
Snap for 5567502 from 84fb09fafc92a3d9b4d160f049d46c3c784cc941 to qt-aml-release

Change-Id: Ibf876b7e333ee568430bfabfe364691ae490d5d8