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 am: c6c89c80

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



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