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

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

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



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