Merge \"SystemUI: Override notification app name\" into nyc-dev
am: e416a4200a

Change-Id: Ie9977a67456c5a10ca4b9226a0f328f4b594557b