Merge changes Ide60679b,Ie2e41c1c,I5523f49f into tm-dev am: 159faa2b am: 339f2185

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



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