[conflict] Merge "Showing DISALLOW_OUTGOING_CALL admin dialog in the correct...

[conflict] Merge "Showing DISALLOW_OUTGOING_CALL admin dialog in the correct user." into udc-qpr-dev am: 22e9ade0 am: 2db2f47b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/24428947



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