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

[automerger skipped] Merge "Check for timers when checking isCampedOn5G" am: c60a4447 am: ffd98d4d -s ours am: 8291b7d9 -s ours

am skip reason: Change-Id Icbf8f8e57122a1c7f1abffe4b8b6b1a1be97ecbb with SHA-1 18bd2321 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9acf86c69489e26d67d0dad1c07d6e9bab8ab95f