Merge "Handle demo mode and apm error scenarios" into udc-dev am: 27e26abd am: 11f0081d

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



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