[automerger skipped] Merge "Refactor badging notification preference controller." into pi-dev am: 7309dddaa3
am: 0f1986a863  -s ours

Change-Id: I63bcd96df54f610b34f78a3ada639e36b0f97677