Merge "Notification footer shows when there are zero notifications" into...

Merge "Notification footer shows when there are zero notifications" into sc-dev am: 5b0cad99 am: dc74de36

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

Change-Id: Icfac08de9a30ef594773fee926666738b94b46f2