Merge "Merge "Tapping settings button for opening/closing panel" into...

Merge "Merge "Tapping settings button for opening/closing panel" into udc-qpr-dev am: e861ea92" into udc-qpr-dev-plus-aosp am: 511c7127

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



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