am 29f7caf8: am 0df576ee: Merge "Fix crash from USER_PRESENT broadcast in sysui" into lmp-dev

* commit '29f7caf8a2fb6256f441d26a11bc5ccdd0ed787a':
  Fix crash from USER_PRESENT broadcast in sysui