Merge "Use SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED instead" am: 5657d94b39 am: bee3f643d8 am: 9b585d8e0b
am: 69bfb496f5

Change-Id: Ia750dc54c58798317e2f05a0e05d881b9ea9ded0