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

Merge "Merge "Override work profile OEM telephony shortcuts with defaults" into udc-dev am: 0b2cda77 am: 9e602157" into udc-d1-dev-plus-aosp am: d32d59b9 am: b122ea14

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



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