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

[automerger skipped] DO NOT MERGE "Add FEATURE_TELEPHONY_SATELLITE feature definition" am: e3fd4177 am: b96e1592 -s ours

am skip reason: subject contains skip directive

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



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