Merge "Remove flaky annotation" into sc-v2-dev am: 5eb2ccc35b am: 0095c4e065

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

Change-Id: I6c06e195600114c5c1eefe4de87e84fc8acf9e44