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

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



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