Android mainline 10.0.0 release 3
Snap for 5558719 from f4737f22b39d15910abb8c532f058dc0e2462f2f to qt-aml-release

Change-Id: Ie61a1c4931148b67a10943120b3c1b3d8aff2a41