Merge "Fix missing notification footer." into sc-v2-dev am: 2dc6f38b9a am: f1fc553791

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

Change-Id: I7b47bf5b628d28be9852bc28ea71af565cd13265