[automerger skipped] Merge "Add new Telephony feature flags and update API...

[automerger skipped] Merge "Add new Telephony feature flags and update API annotations" am: 3d7b4e4d am: aa21aea9 -s ours

am skip reason: Merged-In I511afb5afc52b859a37f8ae27ab671c2b8037527 with SHA-1 c47df7fd is already in history

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



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