Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f21

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

Change-Id: I2ba16cb8e34ba0e4ed6012884fcca426bb50fbab