Merge "Restore notification stack updates during lockscreen-to-shade" into tm-dev am: 022f4485

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



Change-Id: I31e851cbd6420db7d0c80713d49de74196e6af3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>