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

Change-Id: I587cbdb12fc6be595c312277dcbaa2d63f883f12