Android mainline 10.0.0 release 4
Snap for 5964166 from e2d5166d6ccd1bbcd444a4a406c7811ab3216867 to qt-qpr1-aml-release

Change-Id: I2eb27aa92895ff76e3234d8298f7013783e9f9d1