[automerger skipped] Merge META-INF/services/* files in merge_zips -jar am: 47efcdcf -s ours

am skip reason: Merged-In I69f80d1265c64c671d308ef4cdccfa1564abe056 with SHA-1 7592d5a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24216885



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