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

Change-Id: Ib4711c68ac8f92eb7005c126a1573efc2c2c42a4