Merge "fix SIM related VTS failures" into tm-dev am: a8608c37 am: 4943127b am: c8d575a2

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



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