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

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

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

Change-Id: I31a3d61e4f576077f73f355e21d33501ca5d69bc