[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: f19320aca6 -s ours

am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 ad01bf88a7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

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