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 am: edceda51 -s ours" into sc-v2-dev-plus-aosp