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

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

Change-Id: If706e50a3119aeff04e7a61ffb1392f93e149d37