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

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

Change-Id: I787cb50703c4773f09918f4746009632581ef345