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



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