Merge "Show "Android System" instead of "Shell" on notifications." into nyc-dev
am: 28baa37

* commit '28baa37a5676297b7972cfd90a07fff5f54cf19b':
  Show "Android System" instead of "Shell" on notifications.

Change-Id: If1238072e38b7dd4b6b5f10a0e325edfc455cdc1