Merge "Don't allow Enterprise to override disallowed reason" into udc-qpr-dev...

Merge "Don't allow Enterprise to override disallowed reason" into udc-qpr-dev am: 82c397bf am: 5c1f8fd7

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



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