[automerger skipped] Merge "Check for timers when checking isCampedOn5G" into...

[automerger skipped] Merge "Check for timers when checking isCampedOn5G" into rvc-qpr-dev am: 8e9b7568 -s ours am: 5f06f176 -s ours

am skip reason: Change-Id Icbf8f8e57122a1c7f1abffe4b8b6b1a1be97ecbb with SHA-1 7c9eb710 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349a181be96d05069070ce8ee0692e56c9d35ab0