Merge "Promote stable flicker tests (app close)" into sc-dev am: 488a0a3b am: 6d9e90b6

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

Change-Id: I1d2ff9502096b40357226e49893b564c3e5a5c87