[automerger skipped] Merge "Don't allow Enterprise to override disallowed...

[automerger skipped] Merge "Don't allow Enterprise to override disallowed reason" am: 77db2843 am: a22a7688 am: a8d7dcc0 am: c6c89c80 am: 9e5ae7c6 -s ours am: 4763ae30 -s ours

am skip reason: Merged-In I526b3f0255f2443258fcf4707e76da52a733f7c9 with SHA-1 6b8d2f94 is already in history

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



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