Merge "Enable incidentd access to ro.boot.bootreason"