[automerger skipped] Merge "Add new telephony feature flags" am: 7863bb51...

[automerger skipped] Merge "Add new telephony feature flags" am: 7863bb51 am: fbb7ff88 -s ours am: 818001c0 -s ours am: 66ab8eaf -s ours

am skip reason: Merged-In I7a024da0c901b3dcc8bc5385181411cdc12a1426 with SHA-1 1102066f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1909852



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