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

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

Change-Id: Ia1c636c7c29793a2cc7a23d44792ea2208af3d0c