Merge "Use SetScreenLockDialogActivity to power screen lock setup prompt" into main