Merge "Fix race condition in CARSM unit tests" am: ff43d889e7

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

Change-Id: Id899db8de58fb27dcf3f3cbfe5d77454adde02e8