Merge "Keep the shade footer visible during clear-all, if there is a button to...

Merge "Keep the shade footer visible during clear-all, if there is a button to display" into udc-qpr-dev am: ccb4330c am: 7d300795

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



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