[automerger skipped] Merge "DO NOT MERGE Revert "Add...

[automerger skipped] Merge "DO NOT MERGE Revert "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into udc-dev am: 9bfb63c7 am: 1f2023e2 -s ours

am skip reason: subject contains skip directive

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



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