Merge "Hide footer for empty shade even if bubbles are present" into sc-dev...

Merge "Hide footer for empty shade even if bubbles are present" into sc-dev am: e2eda079 am: caa61e6c

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

Change-Id: I95e9348b68e28224d5558f95cd66819b7d247964