am f3aa1c8d: Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-dev
automerge: d99ae19

* commit 'd99ae19303105ab7ba3df1907e1537157d6889e1':
  SysUI: Use mScreenOnFromKeyguard for panel visibility