[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: f2bff353 -s ours am: 4af2fd35 -s ours am: 85712328 -s ours am: 98e0845b -s ours am: e57015aa -s ours am: 87de83b6 -s ours

am skip reason: Change-Id Idc684438d2cd622adee9a1c4d1801e308ee5ead7 with SHA-1 1673a7be is in history

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

Change-Id: I80ce5ce8326d5cfc20613c82a1b346159e3f0e43