[automerger skipped] Merge "Fix issue with media notifs being misbucketed" into qt-dev
am: 16e2397de5 -s ours
am skip reason: change_id I19223720bac534ab92219a2962169097819e8efb with SHA1 8c1b763dcf is in history

Change-Id: I3985d7c5ea2a36d1eeed5239fe7309d582e1b9e4