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

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

Change-Id: I8113baaa002b6766b1eea5b53cec5e58711782fd