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