Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036 am: 16dadd0ae7 -s ours am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84 is in history" into qt-r1-dev-plus-aosp