Merge "DO NOT MERGE "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into...

Merge "DO NOT MERGE "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into udc-dev am: 4b21981e

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



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