am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev

* commit '2f52f74c4a670370e32b36ecb89a06f5203df8d1':
  Use simpler layout for auto-redacted notifications