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