[automerger skipped] Merge "Add FEATURE_TELEPHONY_SATELLITE feature...

[automerger skipped] Merge "Add FEATURE_TELEPHONY_SATELLITE feature definition" am: fae4569b am: 0209a1af am: 00cf847a -s ours am: f754d73b -s ours am: 8f8422da -s ours am: 1c854841 -s ours

am skip reason: Merged-In I73e0f8b0e20b308e85afd123d9169f827c963c12 with SHA-1 186a1948 is already in history

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



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