Merge "Use simpler layout for auto-redacted notifications" into lmp-dev