Merge "bootstat: Update the wording of 'soft reboot' to 'runtime restart'." am: 31cf946d5b
am: 0d5300a12d

Change-Id: I4bd92d160270234dadc442f28042114d71fc2854