am caf4828c: Merge "SysUI Tests: Make tests not break SysUI" into lmp-mr1-dev

* commit 'caf4828c77b692b6e608a4c6561069783983b7b1':
  SysUI Tests: Make tests not break SysUI