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

Change-Id: Iebab5ac2cd5394b3e2085a6a0f21892dd89dcfdc