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

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

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