Android mainline 10.0.0 release 2
Snap for 5335706 from 173d924eceaa33fe7f731dfc692dd1e1cace80f3 to qt-release

Change-Id: I1657511103a6f74743a4710c6accd077c4460a63