[automerger skipped] Modify the functions to meet the Android T new design am:...

[automerger skipped] Modify the functions to meet the Android T new design am: cd92e0cc am: c2021a86 am: e62467d7 -s ours am: 829799b0 -s ours

am skip reason: Merged-In Ibae78cab145cc188cd06d7211a4170e56192252e with SHA-1 7275d3ad is already in history

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

Change-Id: I6a336af6c20ca3320f3d860929e7ba412f5c6d75