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

Change-Id: I27aa3e4ebe9cd49f48834bdcc7a53ef656f22c57