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: Icc029d5c4236e35a08f2f9336b5e971d15a949c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>