Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f am: 8d4b42a0" into rvc-d1-dev-plus-aosp am: b2c1b3c3

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

Change-Id: Id7678d6baa7d2d0b873bde26276f9b2110bcdec5