Merge "bootstat: test: inject ro.boot.bootreason values" am: 3bc8d4529e am: 4f9ba3f0ba
am: 7d47f2f99c

Change-Id: I833235397803eaf523360fa64054412447feb0d0