[automerger skipped] Merge "Use FLAG_IMMUTABLE for InboundSmsHandler" into...

[automerger skipped] Merge "Use FLAG_IMMUTABLE for InboundSmsHandler" into oc-mr1-dev am: dd68c50a -s ours am: e64fc038 -s ours

am skip reason: Change-Id Idc684438d2cd622adee9a1c4d1801e308ee5ead7 with SHA-1 0b1bc3c8 is in history

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

Change-Id: Id8fe4d9a73c433c1118190986ec919f735d65f43