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

am: 0f1986a863  -s ours

Change-Id: I63bcd96df54f610b34f78a3ada639e36b0f97677
This commit is contained in:
android-build-team Robot
2018-05-03 22:29:05 -07:00
committed by android-build-merger

Diff Content Not Available