Android Mainline 10.0.0 Release 7 (6046485)
Snap for 6001299 from 81303e4c8f3889857925d4253a8a134d088a13a0 to qt-aml-media-release

Change-Id: I1c8d4e1c752c4ab28d6f4b2eedc5a511668ef74a