[automerger skipped] Fix synchronization in SystemStateHelper am: e87e605f6b am: e11954344f -s ours am: a473273448 -s ours

am skip reason: Merged-In Ie4c2311278c7c27560c16c87d1eeed282470f9e8 with SHA-1 04263bffef is already in history

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

Change-Id: Ic3729d4ddd98b802638c03854d98364a615599fa