Merge "Don't retrigger bootstat during userspace reboot." am: 64e28438c8 am: 5ebeb57439 am: 58b15c03b7

Change-Id: I961194c0b592de0931e56aaa19b5451f4dbe0a17