Merge "bootstat: comment out duplicate entries in kBootReasonMap" am: 1408ceec4f
am: 07e4e9b5fc

Change-Id: If9f7c72d286b926253602f141245ccf9385e23d4