Merge "Conserve activity flag after notif update" into rvc-dev am: 0d8689233d am: 5596dea455

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

Change-Id: I25272521d552992bc83d7848be6c81e794839ac0