[automerger skipped] Merge "Fixed incorrect count logic" am: ff41e6db am:...

[automerger skipped] Merge "Fixed incorrect count logic" am: ff41e6db am: 092f18b6 am: fb31d586 -s ours am: be9de191 -s ours

am skip reason: Merged-In I867a3ef33738de1444a375083a7033e597862026 with SHA-1 020211c4 is already in history

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

Change-Id: I7e47cdb3c2d4e595b6624f15e50102ef50ce5e85