[automerger skipped] Allowing enabling new data by device config am:...

[automerger skipped] Allowing enabling new data by device config am: f9c8c94f am: ad18f3b9 am: dc215d5a -s ours am: 3afb1a19 -s ours am: fa520ba9 -s ours

am skip reason: Merged-In I70acc0df688ba6b8a87235e81089792719476278 with SHA-1 96c43397 is already in history

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



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