Merge "Use checkOp instead of noteOp in AccountManagerService." into qt-dev