[automerger skipped] Merge "DataConnection fix race condition due to...

[automerger skipped] Merge "DataConnection fix race condition due to mApnSetting" into sc-dev am: 647ed5a4 -s ours am: 9986d463 -s ours am: 27efd83d -s ours

am skip reason: Merged-In I85ca70494f0b2663d3344f2a7c3e6e9a68a57ca1 with SHA-1 1b3b4827 is already in history

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

Change-Id: I8f0bd42f7c675e2df34988fefd65c9023d9cf19b