Merge changes from topic \'substitute-notification-app-name\' into nyc-dev am: 955009f9
am: 5bab149b
* commit '5bab149b':
Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
Show "Android System" instead of "System UI" in screenshot notifications.
Change-Id: I8d61f98f8173feadd3b5cfbe01633779e9d9b25e