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

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



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