[conflict] Fixing test that is breaking in some environments. am: 735a3d61...

[conflict] Fixing test that is breaking in some environments. am: 735a3d61 am: 2b54e1af am: 4cfed2ae am: ea922793

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20618518


Bug: 261482009

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