Merge "bootstat: add reboot,longkey sub-reason to known set" am: c0349199db
am: 3418abfed7

Change-Id: I1bbebb85ea7da6b64930a594f41389eaf606b3df