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