Merge changes I1f999162,Ib8fd7ed1,Id29bd66c am: 30f3bcd880 am: 63306ae7cf

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

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