DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
am: db380fa9cb

Change-Id: I248be6a106a5dc20b5e391b2aebc267786a97e65