Merge "Merge "Remove android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED intent." into oreo-mr1-cts-dev am: c4e9bb24b4"