Merge \\"Docs: Used NotificationCompat.MediaStyle\\" into nyc-docs am: b2baf25d34
am: b36153a8a1

Change-Id: I8ff6dbe07ebf4c3e07309f6155c5614244e907b2