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

[automerger skipped] Merge "Use FLAG_IMMUTABLE for InboundSmsHandler" into oc-dev am: 4b8325ee am: 23c0c88b am: 4d989de3 am: 88ad99e8 am: 19881c2a -s ours

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

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

Change-Id: I97280f47ee51c0055ebbd73336412bebef133e88