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

[automerger skipped] Merge "Use FLAG_IMMUTABLE" into oc-mr1-dev am: 22c956e3 -s ours am: 046a8288 -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: I710b996fe58344e055f052f2642b38e1ffa7da60