Merge "Hide media on AOD when not playing" into qt-dev
am: 5c3320d720

Change-Id: I28ab2ca482c2fbbca048f87a3daf9d01524916eb