[automerger skipped] Merge "Fixed the concurrent modified exception" am:...

[automerger skipped] Merge "Fixed the concurrent modified exception" am: 5a83929f am: 55a732e4 am: 77a3ae53 -s ours am: 42e32c58 -s ours

am skip reason: Merged-In Ife1624c2f8fb02421ffeebfd6749d12bff7d8d68 with SHA-1 b59e2ea4 is already in history

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

Change-Id: I92babfa860d746c6132a95b4f166cfdb15ee34c7