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

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



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