[automerger skipped] Fix AssistDataRequesterTest Flakiness am: 947d06ee am: d5bf22e0 -s ours

am skip reason: Merged-In I04dfa87c762fd9ee7dfcb9d5dd5982780f43356c with SHA-1 6c112678 is already in history

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



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