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

Change-Id: I6f15f8acfd164f8d66aa0514b8393e2fcfda07ab