Merge "Collapse groups when shade is on keyguard" into tm-dev am: 6088a737

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



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