Merge "Restore notification stack updates during lockscreen-to-shade" into...

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

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



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