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

Change-Id: I356dcf376002d95238509235389d260e179fea26