Merge "bootstat: add recovery,quiescent and reboot,quiescent to known set" am: 8d246b22ee
am: 0e505123e1

Change-Id: Ied66003c52cb2686795cbe93b1d9f0a5be7ad00c