Merge "Don't attach PendingIntent if settings app is hidden." into rvc-dev am: 8ba3431761 am: c28d70db77

Change-Id: I76728c3958e3c38e8f5f4bf55e408c6335d8825a