[automerger skipped] Fix race condition in data network am: 2b640ee5 am:...

[automerger skipped] Fix race condition in data network am: 2b640ee5 am: fc4e678e -s ours am: fc8682e9 -s ours am: e504e7db -s ours am: 97dc2d28 -s ours

am skip reason: Merged-In I8dfd8a7e747d7dd21508e204239e81d285d3ae7f with SHA-1 60627011 is already in history

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



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