Merge "Fix NullPointerException issue due to threads race" into main am: 766788dd0c am: 2bca896019

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

Change-Id: Ib2a9d1321f0a84fe194549dae4b70353b9ff5782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>