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



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