Merge "bootstat: add support for regex in aliasReasons and powerkeys" am: f4be06450a
am: 4134f4c701

Change-Id: Iaf9c670ed74aa395455252bfda9a2b3933654d11