[automerger skipped] Merge "Send placeholder OOS ServiceState when subId goes...

[automerger skipped] Merge "Send placeholder OOS ServiceState when subId goes invalid" into rvc-qpr-dev am: 6542c6ec -s ours am: 84683845 -s ours

am skip reason: Change-Id Id0e150dacbd762a2e5e801d200241334d10a504d with SHA-1 4a5ebd60 is in history

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

Change-Id: Ie3969e3b7d04c0b4a369f8545a943334c5bcb280