Merge "Add Flicker tests for launching app from Notification CUJ" into tm-dev am: 64d297bc am: 4c6385ae

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



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