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: 5596dea4 am: d72e2ffe

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

Change-Id: I6d638e3b13aaa71af8b08a7f9db7805920cd23ad