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

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