Merge "Merge "Throw new IllegalStateException in CallRedirectionService when the call redirection is not initialized yet" into sc-dev am: ba314fbb85 am: e8021fb567" into sc-v2-dev-plus-aosp