[automerger skipped] Merge "Added FLAG_IMMUTABLE flag for security purposes"...

[automerger skipped] Merge "Added FLAG_IMMUTABLE flag for security purposes" into oc-dev am: 7a90d83f am: 896503f5 am: 9e733ed1 am: ecaa7e3a am: 40deb46f am: d1f9a1c6 -s ours

am skip reason: Change-Id Ice6e438eb437d377f8c5f26891938302fcb0c8d4 with SHA-1 734b33bb is in history

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

Change-Id: I128e839633cc9ee84e877ce495c80e83696be0ff