Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev