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

Merge "Merge "Do not dismiss notification, flip activity flag" into rvc-dev am: fe16654f am: 8d4b42a0 am: 73cf407d" into rvc-qpr-dev-plus-aosp am: 2b35012e

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

Change-Id: Ie675df688032e19b2f0aafdda524ddefa3e781e6