Merge "Carrier redirection does not work after checking user app redirection" am: 57a0c9fa

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1992710



Change-Id: I1b8c1dea7e60a382986d1ac8b7ccf144469c16b1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>