Merge "Show a link to app settings in notification guts." into oc-dev
am: 0ff1b458ac

Change-Id: I27b70e04b9924c95dbd2f915d27c0e346f2f0a09