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

Change-Id: Iff64c50170add9331ad840b3a2c60170947922d6