Android mainline 10.0.0 release 3
Snap for 5333170 from 0ecdebd5bb7ac5e65739859754d229ebf7245596 to qt-release

Change-Id: Ib6ac92261410ffa08efbb8e9b34ff7cbac164edc