Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: 13cb599536
am: 37c6015d9d

Change-Id: Ie884649d96ed020696a2ae6ba5bc46cf0d7ad92d