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

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

Change-Id: I05474595ed98b643fa3ae89335ab3d37b4fb39ea