Merge "Don't retrigger bootstat during userspace reboot." am: 64e28438c8

Change-Id: I160bbc6da4722bb9692866a164905181e0dbf09d