Merge "Merge "Conserve activity flag after notif update" into rvc-dev am: 0d868923 am: 93cf1840" into rvc-d1-dev-plus-aosp am: a11ca98f am: b5e78021

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

Change-Id: I757e1d6dc312ccebfa737a66994c826b3ca255de