Merge "[MEP] Add CTS for EXTRA_RESOLUTION_SUBSCRIPTION_ID intent extra"