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



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