[automerger skipped] Merge "VTS testcases for HAL API setSimSlotMapping" am:...

[automerger skipped] Merge "VTS testcases for HAL API setSimSlotMapping" am: 89d877e9 am: d7c7b7cf am: 331b6220 -s ours

am skip reason: Merged-In Idbff19db2e536d3c2f7b80afbbf244575d8247d0 with SHA-1 5561b4ba is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2052606



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