[automerger skipped] fix SIM related VTS failures am: fd854fe6 am:...

[automerger skipped] fix SIM related VTS failures am: fd854fe6 am: 51f43a36 am: 7bee2b3a -s ours am: f14d5d22 -s ours am: b6f94a1d -s ours

am skip reason: Merged-In I8c12cb1dbc439655f9de88b1e217b3f34e44ebeb with SHA-1 8a6a1d38 is already in history

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



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