Merge "Merge "Added the ripple drawable back to the media notification" into...
Merge "Merge "Added the ripple drawable back to the media notification" into nyc-dev am: 08b38f87 am: cc042f38" into nyc-mr1-dev-plus-aosp
am: eba859f9
* commit 'eba859f9':
Change-Id: Ifb9a573314f2e4684549770935a9d2acd10dea43