Android mainline 10.0.0 release 10
Snap for 6131310 from b6aaecce75ee949b03da891a6a0c4ad382f7b4ee to qt-aml-media-release

Change-Id: I97dfb861d9afbafb571d905e5822384c185bff80