Merge "Add FEATURE_TELEPHONY_SATELLITE feature definition" am: fae4569bcf am: 0209a1afe3

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

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