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

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

am skip reason: subject contains skip directive

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



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