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



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