Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev am: 6688dae166
am: 5e36b66c91  -s ours

Change-Id: I2df1f21e9ef98683d49624ca8fe9890511872021