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

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

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

Change-Id: I1cf705f23c6dc5d503a7e5de458d180b25b9f97d