Merge "[automerger skipped] Merge "Use FLAG_IMMUTABLE for ServiceStateTracker"...

Merge "[automerger skipped] Merge "Use FLAG_IMMUTABLE for ServiceStateTracker" into qt-dev am: 024ef43c -s ours am: 6ade5d8f -s ours am: 6d450884 -s ours am: 58009d66 -s ours" into rvc-d1-dev-plus-aosp am: 256bc5d0 -s ours

am skip reason: Change-Id If127b73c975b5b3f004500de7f9baa6a7bc00ce4 with SHA-1 995d562f is in history

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

Change-Id: I1453a25c875c7cbf021ad38d4abe2e462d734d57