Merge "Use SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED instead" am: 5657d94b am: bee3f643 am: 9b585d8e Change-Id: Ic31bfe2939108e1cded2890bc40cff029dff047b