[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding...

[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a am: 63c1d4e8 -s ours

am skip reason: Change-Id Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb with SHA-1 6206afc8 is in history

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

Change-Id: I8ff539e29e31cbaf7fab064df8cedd6bfb5f4e62