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 am: 13b032c5
Change-Id: Iab3b3624dbcdb59edbdc3ff3256393e73faac6c1