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

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

Change-Id: Id8c56230e4d772bf93873c6b20472ba516eb660a