Merge "Shared state modified in two threads without synchronization" am: 0556d460dc am: 648c546acb am: c888ced1ff

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

Change-Id: I0e7a79d2ace363eb4cb37b6164c723ae01f2ccca