Merge "Settings: Fix leak of BroadcastReceiver intents" am: 3499af28c4 am: 1b4a0abdbb
am: 517b35fa1c

Change-Id: I11f0b50f93e2a722ecf3c8bd398462c967d9bfb2