Merge changes I1f999162,Ib8fd7ed1,Id29bd66c am: 30f3bcd880

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2475768

Change-Id: Icb61f5ce96a46e032e11e6a54fe4987eb8373e3a
Signed-off-by: Automerger Merge Worker <[email protected]>