Merge "flaky error fix in SimRecordsTest file" into udc-dev am: 7d9a36a2 am: e0aa6d13

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/21806843



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