DO NOT MERGE Fix Notification Settings when unblockable app is blocked. am: db380fa9cb
am: 1eefc78280
-s ours
Change-Id: If9d0a59c98cd2502aa79537bd210ac7321b607aa
This commit is contained in:
db380fa9cb
am: 1eefc78280
-s ours
Change-Id: If9d0a59c98cd2502aa79537bd210ac7321b607aa