Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: d27aee3322 am: e028be05dc am: e5f67cb590
am: 5249c4277b

Change-Id: I819187dd5923969047e48297b2446a1c5988bb92