[automerger skipped] Merge "UserspaceRebootLogger: query sys.boot.reason.last" am: b332edd6a9 am: 8687792159 -s ours am: cbece3c609 -s ours
am skip reason: Change-Id I13474d8a5be9382f56fdc8f17cf201666492e60d with SHA-1 7bc82dd543 is in history
Change-Id: If8bfcfd92a9178ff4612f58fb0a8a9c797070e69
This commit is contained in: