Merge "Self-Managed calls are not permitted on secondary user" into udc-dev...

Merge "Self-Managed calls are not permitted on secondary user" into udc-dev am: 08f46018 am: b0dc8e0c

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



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