Merge "DO NOT MERGE Revert "Add FEATURE_TELEPHONY_SATELLITE feature...

Merge "DO NOT MERGE Revert "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into udc-dev am: 9bfb63c7

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



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