[automerger skipped] ATest: Fix unit test failure. am: 99a7175286 am: 86f3578111 -s ours am skip reason: Merged-In I96fb3d3f840d4f45ba6558cbf4320a2685eb0715 with SHA-1 99a7175286 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/asuite/+/13698205 Change-Id: Iaf6a68c0513e3a6c6ad814c4ccc1bc3132c303b7