Fix race condition in data network am: 60627011 am: 55ec7795

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17773765



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