[automerger skipped] Merge "Fix createConfigurationContext's...

[automerger skipped] Merge "Fix createConfigurationContext's UnsupportedOperationException" am: b6bc4e78 am: 51ceff1d am: b426ba96 -s ours am: 0b5abf56 -s ours

am skip reason: Change-Id If2007f69a2f2b5a421bbd6c9b4358cf08595af8c with SHA-1 3c3b7780 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idea6c592ea193cc6f95b360941a3360b17f8d500