Merge "Refactor badging notification preference controller." into pi-dev
am: 7309dddaa3

Change-Id: I198931640f8d0f3b59c966e4f7c6d6143ec6597f