[automerger skipped] Merge "Added a new config to enable telephony new data"...

[automerger skipped] Merge "Added a new config to enable telephony new data" am: 6dd7157b am: dc815221 am: e615f0d8 -s ours am: e18a437a -s ours am: 247f7911 -s ours

am skip reason: Merged-In I3ab030f2635406dfda2d62a2a9e18f7671bcb389 with SHA-1 30fd76be is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052599



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