[automerger skipped] Merge "DO NOT MERGE "Add FEATURE_TELEPHONY_SATELLITE...

[automerger skipped] Merge "DO NOT MERGE "Add FEATURE_TELEPHONY_SATELLITE feature definition"" into udc-dev am: 4b21981e am: e21e82cf -s ours

am skip reason: subject contains skip directive

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



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