Merge changes from topic 'substitute-notification-app-name' into nyc-dev

* changes:
  Move EXTRA_SUBSTITUTE_APP_NAME to the published system api.
  Show "Android System" instead of "System UI" in screenshot notifications.