Merge "persist.sys.boot.reason is cleared once read by bootstat" am: 8ec0c6ba48 am: 660c145dd1
am: 9aeef94b8e

Change-Id: Ie86a85efee460df082a3b114c38dea9ac444b1bf