[automerger skipped] Merge "Added a new config to enable telephony new data" am: 6dd7157b96 am: dc815221a7 am: e615f0d800 -s ours am: e18a437a86 -s ours
am skip reason: Merged-In I3ab030f2635406dfda2d62a2a9e18f7671bcb389 with SHA-1 30fd76bef1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052599
Change-Id: I3626e9c9fc7c88fef6aa6dce20f040d896f80b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: