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

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

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



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