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 sc-dev am: af8c9878 -s ours am: 947233f3 -s ours" into sc-qpr1-dev-plus-aosp am: fecf17b6 -s ours am: 1f8a8b11 -s ours

am skip reason: Merged-In I49e2b8bcec7b2ce0a9776ff30a64c07f24949da7 with SHA-1 42e8c45e is already in history

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

Change-Id: I7d0933af3879ce1c17fc1e89e2206c2eb387e4e1