[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: 0b7f36f6 -s ours

am skip reason: subject contains skip directive

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



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