Merge "Fixed the concurrent modified exception" into sc-qpr1-dev am:...

Merge "Fixed the concurrent modified exception" into sc-qpr1-dev am: b0936add am: 407ef3d2 am: 40be025b

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

Change-Id: I3890491588fa9a489e13d355f21d28ae583d69b1