Merge "Remove the FlakyTest annotation from no-longer flaky test." into...

Merge "Remove the FlakyTest annotation from no-longer flaky test." into tm-qpr-dev am: 6e5aa44a am: cb7370b1

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



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