Android mainline 10.0.0 release 2
Snap for 5663823 from d5d6a49ce8e7c24d11d2c627342b862fe94aa82b to qt-aml-release

Change-Id: I50df7f89c2cb6514e06d3d00d00e254e3bcd1764