[automerger skipped] Merge "Add preferredDataProfile teardown check" am:...

[automerger skipped] Merge "Add preferredDataProfile teardown check" am: 3c48f29c am: 4e12cbf9 am: ccd36dfa -s ours am: 84b27a00 -s ours

am skip reason: Merged-In I2573ebc2ee50ab08f79d423edf36bad5ee55634d with SHA-1 9b254f26 is already in history

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



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