Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: 0172ce8dbf
am: cf5fa80fbf

Change-Id: Ica26cd9240a977d9140c72f5606c8b9d874001d9