Merge "Don't allow Enterprise to override disallowed reason" am: 77db2843...

Merge "Don't allow Enterprise to override disallowed reason" am: 77db2843 am: a22a7688 am: a8d7dcc0

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



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