Merge "[automerger skipped] Merge "Do not show the notification footer until...

Merge "[automerger skipped] Merge "Do not show the notification footer until the user is set up." into rvc-qpr-dev am: bc11c1a6 -s ours am: 98040f89 -s ours am: 9603f243 -s ours" into sc-qpr1-dev-plus-aosp am: 931115b1 -s ours

am skip reason: Merged-In I49e2b8bcec7b2ce0a9776ff30a64c07f24949da7 with SHA-1 73c3c0a7 is already in history

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

Change-Id: I73c06deb4f518a37f22157902d50065b15a051eb