[automerger skipped] Merge "Use FLAG_IMMUTABLE" into pi-dev am: 8e773e93 am:...

[automerger skipped] Merge "Use FLAG_IMMUTABLE" into pi-dev am: 8e773e93 am: d9d3140d am: 67cb295d -s ours am: 65cf0777 -s ours am: e5db1ae4 -s ours am: fd6b76fb -s ours am: 0b05bc5f -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/+/11402661

Change-Id: Ib55dc6832b9a64574ba443856a2953fa69483abe