Merge "Make some intents public in SubscriptionManager." am: 35e9a94dee
am: c29fff5032

Change-Id: I8f9794c75009932d0b7d5893e913fbfbd7b13c37