Merge "Collapsing shade when user clicks on shade_header_system_icons from...

Merge "Collapsing shade when user clicks on shade_header_system_icons from shade header" into udc-qpr-dev am: 1ad38e26

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



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