Merge "Override work profile OEM telephony shortcuts with defaults" into...

Merge "Override work profile OEM telephony shortcuts with defaults" into udc-dev am: 0b2cda77 am: 9e602157 am: 36b47d53 am: f5ec9815

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22990097



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