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

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



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