Merge "[automerger skipped] Fix: Block opening settings app on keyguard without user auth am: 4eeb65a1f6 am: 62a0881baa -s ours" into main