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

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



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