Merge changes from topic "cp" am: b5b1ea3a

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2138212



Change-Id: I378d945107980e9010feef900e457271b49c981f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>