Merge "Use SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED instead"
am: 5657d94b39

Change-Id: Ic2652c0d5f7c7912dcddd81c78ea85c57a761689