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

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

Change-Id: I15fded68a418b36bb9d520821792858e3f5685d0