Merge "bootstat: enhance last reboot reason property with file backing" am: 7550e6f882 am: ffd276388f

Change-Id: Ib88d1f04b039d613d1bfe536383036a64b3ab9a7