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: 15e39cec am: 7896cd9d

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



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