Merge "Merge "Never fetch notification badges for USER_SYSTEM" into nyc-dev am: 0a9ccf2619 am: 66bd6bca16" into nyc-mr1-dev-plus-aosp
am: a3bfb0e086

* commit 'a3bfb0e086f8e169f1737ec452665ce7568d61dc':

Change-Id: Iafe43c857c0943a982f3b866d3b71b47e87171f8