[automerger skipped] Merge "Update 5G DeviceStateMonitor indications based on...

[automerger skipped] Merge "Update 5G DeviceStateMonitor indications based on settings" am: 3099019d am: f8024b98 -s ours am: c8068fa5 -s ours am: 7812655e -s ours am: 0c901a29 -s ours

am skip reason: Change-Id I91cfea4cfe2afd0d92ab55e607b69e99447778c9 with SHA-1 0a2cf1d7 is in history

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

Change-Id: I30ab5e90cf9351133a0f52d11c3236cea42a673e