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

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

Change-Id: I1d1e533642da36fdf7adf31e4f6e8bbf2bbefb51