Merge "Merge "Fix appVisible assertion on OpenAppFromNotificationWarm" into tm-dev am: 33c379b7 am: dc4d11bd" into tm-d1-dev-plus-aosp am: d6126789 am: 44d001b5

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



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