Modified NPE and typo of abbreviation of log tag am: e497c26a24 am: 286346def9 am: c11bc1a734 am: 3e9454cf3a

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

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