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

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

Change-Id: I85855947987e4cc06994b0143b8b1828ea265e8b