Merge "bootstat: Add reboot,userrequested" am: 0bb8dcb23e
am: a451a98f0e

Change-Id: Iad418b7c81d963e4311f3c680d995dc06bffe025