[automerger skipped] Merge "Add two conditions for NR icon primary timer...

[automerger skipped] Merge "Add two conditions for NR icon primary timer disabled" am: 2012baac am: c7c5adc0 -s ours am: 5df4b797 -s ours

am skip reason: Change-Id Ib636d2cca7dd334eb38881ad496c39453d12f1ca with SHA-1 74d29587 is in history

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

Change-Id: Id7d808000d78072f7b31416ed9d3c1d09f8b7dbf