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: 552ce28c am: b7c45270

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



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