Merge "bootstat: Add some reserved sys.boot.reason values to enumeration" am: 444e3a9f74
am: bd7bbf853a

Change-Id: Idedc1989abbd601c16699bd7418dc863f4a9d90d