[automerger skipped] Merge "Extend 'phone cc set-value' to support bundle-valued carrier config" am: fd7d4c6034 am: 2315287436 am: 1f9fec5234 -s ours am: ebed3243b1 -s ours

am skip reason: Merged-In Id26fcbbd11a7486f87e3b034c0badf923c63b8f6 with SHA-1 ee00f0e55c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2043059

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