Merge "Revert "Change the order of mErrorReason and mOperationExecuted before...
Merge "Revert "Change the order of mErrorReason and mOperationExecuted before sending broadcast" am: e180c006 am: 902d4701" into rvc-d1-dev-plus-aosp am: d5639c16
Change-Id: I3c86b4e394def4812d153dc76f24ca88bce44590