am 5dd2c2cc: (-s ours) Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-preview-dev

* commit '5dd2c2ccf61d582472588163ca062081e6068986':
  SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE