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



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