Merge "[automerger skipped] Merge "Use FLAG_IMMUTABLE" into oc-mr1-dev am:...

Merge "[automerger skipped] Merge "Use FLAG_IMMUTABLE" into oc-mr1-dev am: 22c956e3 -s ours am: 046a8288 -s ours am: 03b7ec25 -s ours am: f587dc9c -s ours am: 44578377 -s ours am: 599ff683 -s ours" into rvc-d1-dev-plus-aosp am: 94ae32aa -s ours am: 65d44405 -s ours

am skip reason: Change-Id If127b73c975b5b3f004500de7f9baa6a7bc00ce4 with SHA-1 a2183fe7 is in history

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

Change-Id: Ib79700f65d5b2c362b951c8789f275029219dd0b