Merge "Shared state modified in two threads without synchronization" am: 4ad859af44 am: 368ad41dd0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1656852

Change-Id: I9424ca2b44391a5a29cee4b1da50f4cb18cef96a