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

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



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