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 am: 6fc92fb8

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

Change-Id: I4d34e3ce0277390defe90e4e94d26cf2e64cfa9a