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

Change-Id: Ia451c27b22d998b20dd11024841c29cf073d5768