Merge "Merge "Conserve activity flag after notif update" into rvc-dev am: 0d868923 am: 93cf1840 am: 9236a95a" into rvc-qpr-dev-plus-aosp am: 31cbb3e6

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

Change-Id: I195da03b4c5a1590f1e3e6122acecbc262653411