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 am: 4d72e2eb

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



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