Merge "allow phone error messages from lock screen" am: 3614b0d055 am: f90ef40be0

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

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