Android mainline 10.0.0 release 2
Snap for 5803298 from a5e5c177d1648dc5b2d8c5a944586a4e15dc4e04 to qt-aml-release

Change-Id: I4cec80eba61a5f2fb45f81e3425167f4eb082d57