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

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



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