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: Ic0b4b2460c11426c3e6b529baec3ddd3db0a6f0a