Merge "Allow some system notifications to be blocked." into oc-dev am: 3a2ac3e11b
am: a98bdea2c5

Change-Id: Iec706994f0c7af34ba38b01fffaccdf6ee1bbe84