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