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

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

Change-Id: If94046f5a5ef3201d4ae1ee349f89026e99a1532