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

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

Change-Id: I8b97ca2a43da0f6dfefe4d8274f6dd532896bf9d