[automerger skipped] Merge "Apply mSubInfoListLock lock whenever touching...

[automerger skipped] Merge "Apply mSubInfoListLock lock whenever touching mCacheActiveSubInfoList" am: 25657717 am: 325050b4 am: 28ab52a0 am: 030c7986 -s ours am: 6884bdaa -s ours

am skip reason: Change-Id I8e21b98e40862cbcdceb9943c0296feefea7df9b with SHA-1 f08c38c4 is in history

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

Change-Id: I5f676927f51ddf31d7a7c5ffbe04bb1c2b3babf9